Merge pull request #532 from soby-mathew/vk/configure_mmap_macros

author danh-arm <[email protected]>

Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)

committer danh-arm <[email protected]>

Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)
author danh-arm <[email protected]>
Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)
committer danh-arm <[email protected]>
Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)
diff --cc docs/user-guide.md
Simple merge
diff --cc plat/arm/board/juno/include/platform_def.h
Simple merge
diff --cc plat/arm/board/juno/platform.mk
Simple merge
author	danh-arm <[email protected]>
	Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)
committer	danh-arm <[email protected]>
	Mon, 22 Feb 2016 13:23:49 +0000 (13:23 +0000)
		1	2
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/board/juno/include/platform_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/board/juno/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history